bug fixing 499