Fixed: Issue #40