bug fixing....:(