fixed BUG#7