Fixes Wolfe's issue