fix for dynamic