Fix issues #1