Resolve #21, #22