Fix #9 #11