attempt to fix #313