customHandlers added fix3