And now for a bug fix