Bugfix/android graph legacy