Fixed #2 & #20