Attempt to fix #3