Fixing bug after refactoring ifs to switch.
Merge remote-tracking branch 'origin/master'