Fix clickstart ordering