bug fixing 427
bug fixing 302
bug fixing 467
bug fixing 486
bug fixing 420
bug fixing 420