Make sure every param to set-functions are sets
Release 2.1.1