fixing master for 3.0+