updated for oxid 4.9