Fixing issue #312.