this fixes half of #188