Fixed replace some methods