reenabled custom handlers