fixes ARAKOON-354