Fix #5, #4