Fixing issue #342.