possible fix stackOverFlow
merge fix