Solution for #576 Haiku Review