Fixes bug that ignores the extended field #13