Fix Issue: #2