this workaround is not needed anymore