Bug fix for multiple objects