Issue #185 - Fix undefined data