(#172) One more rebase please...