Fix issue when first line of class is not the package declaration