Fix for initial commit