Fixed issue with creating components