Now compatible with GDM :D