Added stop gap measure for 3.0 & 3.1 conflict.