Fixed Resume Issue

Had to rewrite whole solution, but it works well, now.