Fix issue 1668

An ancient issue- I know this will likely be replaced but wanted a relatively non-critical to cut my teeth on.