fixed Binder bug. handlers need to be enhanced