#23 issue fixed