Fix #3 and Fix #4