This resolves 2 problems: