Attempt to fix #4