And, of course, a last minute bugfix