Workaround ava bug
