bug fix master