#45 issue fixed