Fix issues #2