Bugfix, Issue #7

For Issue #7