Attempt to fix #435