Change ported from UMA20 - required for Unity5 compatibility