Another attempt to fix #2