fix #39, finally! (I hope so)