Fixed #1 and #26