Data Hook Fix