+1 for fixing this in core.