MAJOR FIX: Downgraded to 1.7