Issue #6 Fix
============