Finally, that one `nil` bug is fixed.