Try 2 w/bugfix