Finally seems to work