finished,fixes #1