Slider fix
Merge issue