added flag to maintain original behavior