Make it work with the latest ThunkJS beta version