Fixed non-owrt bird4 handler too.