customHandlers added fix2