Attempt a proper fix for the entity issueSigned-off-by: Ross Allan <[email protected]> (commit: 20f6259)