Final fix.. this works!