Fix for Issue #20 v3

Please work Please work. Paki-test nlng rin ulit