fixed handler processing order