Fixing errors from cd2766d191b6874bac02459f20d207ef7940999a