Reolved problem - Fixes #2