Fix #5 and #2