Updated to r12, fixed #7