Potential fix for #51 - Tests necessary