Fix for needsclick handling