yet another fix from merge..geez