Fix inssue #2