work on issues #56, #44