Corrected path protection (closes #19)