reset fix
merged master