Added fix for ROVER-87