changes to newer versions to avoid weird runtime errors