#duckling - fixes