Fixed Speaker issue