Fix #3, fix #4