minor modification a bit improvement