Split return statement so hack is not necessary and code is a little clearer