Fixed reset functionality