Fixed issue with no value