bugfix - pushHandler