fix master compatibility