Fixed Issue #22 for wrong data