Fix Issue: #3