Fixing parent logic