making fixed for newer places integration