Fix issues #47