#42 issue fixed 2/2