It'd be great to see some tests for this method as well