Finish fix #1, fix #4