cleanup: fixed #36