Fixed: Issue 165