bug fixing..