fixes 6 of #69