Fix defects on #11