Fixed resest, check TODO tag at fix