fix singleton import since it moved