Simplified workaround.