#109 - Fixing-Getting-Data-Issue