Fixed some popping that mysteriously reappeared