[[ Bug 13346 ]] Ensure the offset for 'empty' are 0
Merge pull request #1128 from runrevsebastien/bugfix-13346

[[ Bug 13346 ]] Ensure the offset for 'empty' are 0