Fix 1226 and document associated methods