Another attempt to fix #4