Trying to fix produ issues