Fix #22 #23