New version.

seems to work xD