Fixing #323.