Fixed: Issue#2