Fix #3 and fix #4