bug stashed changes fix