Issue2

Fix for issue2