Another day, another bugfix