Fix short circuiting when didn't want it