Preparation to handle pauses better
Paused problem seem to be fixed according to test