EDIT: Seems to be working finally