Fixed badly merged code