Added fix from STeven for Roborealm