Fixed #1 and Fixed #5