permanent fix for e8a3ad0b5e2b9183932acebe973ff276d94de803