Fix for un-initialized variable error