fix Whale factory