Fix AppIDs 18 and 8 not working properly