Bug fixex.