Fixed an issue with assembly