Fix for not set variables