Fixed #5, fixed #6