Fix for smoothstate