Fixed #299, Fixed problems on removing components