fix all double issues