Error fix for #355