Added fix for fresh installation