Second attempt to fix #119