Fixed #1 and #2