Fixed logical problem handling objects