Maybe edit bugs

Need check on x32 and x64