Fixing definitions