Completing #842