Fix for Predefined Variables