Fixed #2 and #6