Bug fix related to #355