and a small fix...