bug fixing #3