for real this time: fixed freakout....