Finally fix place bug