another fix for UI changes