Fix for issue 13233 (Move from static)