Onclick fix optimized