v2.3: fixed little bug