Fixed #3 and #5