Bugfix: unnecessary condition removed