Fix for quicksetup