Fixed #1 and #6