Subject:BUGFIX: Issue #6

Description: