Attempted fix #331