#18 issue fixed