Sort-of-a-Fix for #11