enhancement: fixed #23