added backward compatibility for GS 3.10