v2.2: fixed little bug