Fix bugs in ducks behavior