Fix for variables set