fix for more oops stuff