Second attempt to fix #196