Fixed invokation order of click handlers