Issue #24: Collision detection is dependent on drawing