Fix #1 #2