Fixes WOLF-37