Issue 11 fix

Fix for the test app