Trying a different approach to deal with 1.8.7 splat