#37 Issue fixed