re-enabled id fix