added comment for removing this workaround