fix bugs

aad