try to get rid off oasis dependency