Changing guard-clause