Attempt to fix #590