Fix #5, #1