Fix for defaults