Fix #1 and #4