Fixing issue #368.