Issue #6 Fix #6