Fixing issue #231