Fixed #323, Fixed problems when unfolding components inside Endpoints