Fixed #1; Fixed #2;