Fix #1 #3