Master bug fix