Fix binding
Review comments