fixed handler issues