Command fix (listening for wrong event)