Fixing #46