Finishes fix for #16