Fix for UI tool