#109 fixed