Fixed for Mr. Proper in #70