Defines, fix 3