Fixes issues #45 ..