bug fixing ...