Fixing Issue #58 (WIP)

Why this change?