Bug fixs again.