some bloody CI voodoo added