Issue 106

Fix issue 106