Fix for static collecting