fixed some issues with handlers