🐛 Fix Invalid sfid Bug

Fixes #166 (closed)

The original branch was fix/invalid-sfid-bug but the merge of develop into it made the changes difficult to understand in gitlab.

These are the changes in a more digestible format.