Cadencii compatibility fix (by Icenowy)