This seems to work better somehow.