Fixing Issue #58 (WIP)