Fixed #2
FIxed #1