Fix for new code