Fix for an empty variable case