Another attempt to fix #5