Add guards for haiku