bug fixing #2