Making ree/1.8.7 compatible