Another attempt to fix #36