Bugfix from last commit - needed else ifs.