Issues #102, #103 are fixed