Fix for variables with nil