This was a problem. Re-design in progress...