Fix: Empty Values

Fix for variables whose value == ''