Seems to work well now