fixed to work on hyades v2