removed disconnect handler
removed whitespace
compat fix