Fixed: #2