Fixed to work with latest BioC