Bug Fix for Tutorial Setup