Controller bug; Todo