trying to fix this replace..