Fixed #3 and #4