Fix (i think) #161 need some more testing