Fixed #Issue 5