bug fixing 420