Missed part of the S3F patch. Fixes #1433