Workaround the rae challenge