Merge pull request #962 from mrnuke/batfix