#582: fixed