Now seems to work