Toggle completion - Bug Fix