fix e743949..9697af0
controller more clear