Temp fix until we convert this to Angular