Possible fix for after_588 problems (might also related to #987)