Issue #79: follow up error fixed — implemented empty value fallback