fixing binding issues