with fixes