Fix precedence
Fix border