Possible fix (but slow)