Fix for dynamic updates