Fix #14 #13