Matt bug fix