Attempt to fix #1130