workaround for bug#2
go home
little modify