Fix for Issue #20 v4

Hopefully OK na ito.