Fixed the nil dup bug properly