Fixed #1, fixed #2