Fix bug #928: More robust sprint creation