Another attempt to fix #141