Sintactic sugar fixed (too much)