Fix support for multiple objects