Fixed to work with latest commits.