Fixes #55, at great expense.