fixed binding issues