customHandlers added fix1