fixed faulty merge 3