fix #32
implementing #34