Fixed for RC8