attempt to address ARAKOON-449
Merge pull request #274 from Incubaid/ARAKOON-449

attempt to address ARAKOON-449