Fixing Ken's fix