fix master 1