Fixed for new launcher