Fix Click issues