trying to fix #27

while not crushing #25.