Fix issue 2

Fix for #2