Fixing issue #144