This seems to be working now