add bug correction from master