Patrick bug fix