Issue #42 fixed bug