Sloppily addresses #371