Another attempt to fix #988