Fixing GA bug