fixed #69

a little better this time