duck bugfix