Fixes #87 in the least dumb way