Fixed: #599