Fixed 'no such object' bug