Small battery issue - fixes #227