Fixes: Issue #4