Moved trigger after fade delay
(cherry picked from commit adc989f)