Fixing issue #327.