Fix for creating useless new objects