Attempt to fix #328