Handlers quequing fix