Partial Fix for #64