Fix #1 and Fix #2