Applied changes made in Alpha 12.