[Issue] Fixed #5. Tricky fixed #7.