rearrange to avoid 1.8.7/ree syntax error