Fix for remote cm