Issues #104, #105 are fixed