Work-around for a larger, more complicated issue.