Fix #5 #6