Fixed to work with new setup.