Fix snapshot creation