fixed fcm bugs