Bug fix reported by rbottomley