Fix for Issue #6 rev. 1