Fixed for all quickstarts.