Fixed an issue with empty variable