Still in pursuit of fixing #18.