Fix #9,10

Fixed both issues