Attempt at fixing the issue in 9145aa1b29209eadcb571a1561021a9fc20e72a5