fixing conflicts with old syntax