#588: fixed