Multiclick issue fix final