fix master issue