#221: format improved