fixed discrepancies due to bad giting