Fixed the fundamental issue, but still poorly designed.