Resolve #258