at long last fixed #35