Added fix for entry graphs