Check in latest with one last bugfix. Still using 1.2.1.