Fix for GS with subbed driver