Added fix for comunity library issue