Attempt to fix #531