Move conditional to right place