bug fixing 337