Fixed issue with empty entries