another attempt at a fix (previous worked in testing)