cleaned up binding handler in 1.1