I did the same regarding the handguard. One word of warning. I ordered one from Boyd which took a couple of months. I finally gave up and ordered one from Brownell's which was more expensive and arrived just before the one from Boyd. The Boyd handguard was better made and was also less expensive, but it would be a gross understatement to say that they don't get in any hurry!