add aubrey's fix