Fix 35

[Fix for issue #35](https://github.com/Evaneos/ev-fdm/issues/35)