Possible fix for latest bug