Fix object expansion