Fixed #3, fixed #4.