Fix #2 and #22