issue37 fixed