Fixed Sub-Issue issue. This fixes #3