Re-apply pull request #202 to be apart of BLC 3.0.2