bug fixing 477
bug fixing 477