enhancement: fixed #6