Issue: #37 Fixes