(bugfix) Remove ternary operator