Fixes #14
Fixed #14
For CRX
For 2.0