Fix to issue 5

Fix to issue 5.