One more try to really fix #159