important bug fixing