Fixed issue with early binding, replaced delegate and bind with on