Addition to Fix for #58

realized this was a bigger mess than I expected, I’ve tried to trim it
down and make sense out of this.