Workaround for inconsistencies