should solve #194