fix R15 compatibility

cc @kellymclaughlin @cmeiklejohn