Fix #4,#5