Fixed duplicatd code section?