Attempt to fix #573.