Fixed #1:the bug one is fixed