Fixed BUG#1