Attempt to fix #1308