This fixes issue 3 that I just reported.