Romain

should fix ARAKOON-386