cleanup: fixed #52