fix bug of https://github.com/benliu723/FromlyAngularStrap/issues/42 & https://github.com/benliu723/FromlyAngularStrap/issues/39