Reverting last commit, it was not the solution @sobermeier should check.