bug fixing 424