attempt to address ARAKOON-449