Fixing #45