Fixed #2, fixed #5