FX-306
Fix for FX306
Merge pull request #112 from iammckane/dev

Fix for FX305