fcm conflicts: fix bug
Merge pull request #72 from benfitzpatrick/fcm-conflicts.fix-18

fcm conflicts: fix 1.8 incompatibility bug