enhancement: fixed #35