change call handler to make sure its not coming first