Fix #13 #14