Bug/105 suave stops responding

For discussion to solve the bug.