Working on this bug with Mac