fix issue of https://github.com/benliu723/FromlyAngularStrap/issues/38 & https://github.com/benliu723/FromlyAngularStrap/issues/44