Trying work-around for F20 issue.