Fix - Closes #73