Fix #2 and #5