Fixed #1 & #2