issues#124 fixed